design tweaks; not currently in a compiling state :(