Finished first basic functionality