Final Tweaks before I implement features