Fixed up code and things are looking good