Weekly Update

Finished milestone 3

Begun work on final code, integrating all behaviors