making some changes...

it might get ugly in this place for a while...