Commit before revamping code
Starting making code less disgusting