Final commit

Everything works now