Finished tightening up some of my arguments. Ready for review now :D