Stage b is working
Cleaned up the code, stage b done