(temp commit) correctly layout classes