Adding some initial functionality and test
Starting to get into name checking