What the fuck was I even doing here?!

Changed structure