i wouldn't recommend merging these changes, they're pretty quick and dirty. i'd just so use this as a jump-off point, maybe a point of reference at most. this was for funsies.
