added basic entity and timer classes
test changes