Final Program as of 3/21

Made concrete changes to program
ggg

Last minute movement changes