added timer and organizing classes