Luke's files

Luke had a merge conflict with himself so I'm committing some files for
him