Fixing and making it work

Only updating progress left to get working!