Finished requirements 1-7, upgraded general usability