cleaning up some code, pretty concise now.. but still wrong.