Refactored some and started some other unfinished stuff