Some stuf
Cleaned up a bit and reverted change that crashed everything