Initial commit, started adding functionality