move stuff around
design overhaul