moved some shit around, now application is so much better