Fixed several issues, now working roughly