Fixed a few things. Almost fully working now