Still working on it but here’s progress