It is mostly done now. Still might need a bit of polishing