still needs a little tweaking in the way of the seats and the what not (removeFromSeat appears to be broken) but its on its way to being cleaner and more maintainable (in my opinion)