Closes #35, gets rid of type properties