Cleaned up for wk2 submission. wk3 stuff commented out