Seventh Commit - Moar Improvements

yknow the drill