creating PR as per todo

[List of todos](https://github.com/TheIronYard--Orlando/FEE--2014--FALL/issues/70)