Finished Assignment #2

Added some stuff