redesigning

dont merge this one yet, just putting it out there.