Pew pew it works... kinda.
More fixes and improvements