Fixes until it all works... Still Janky!