Working on rearranging features so they match UCI better. Split up a couple functions from main file.