Almost read to go now, just need to do some testing
Removed dead code.