Still working on cleaning up code.