Cleaned up my hacks needed to make everything work