New branch, working on fixin things