Things are being reworked

New stuff to come!