Milestone 28

doing it the HARD (but better) way