Updated to master and added creature class