Commit #14

lat commit before christmas i think