Basic Functionality Finished

Untested