overhaul of code

:
crazy shitt merged