Starting to make this my own

Work towards #4