Work 9

Make sure code is working
Ready to merge