Mostly complete! Just a few problems to iron out