Fixed up some code, will add functionality later