Amyr

Added my version. As soon as Eleanor ads her's in, we should be good to merge. :)