cleaned up a lot and started implementing the appropriate commands