derped, added occasion model and cleaned up a bit