Tested and working

Has some marks