almost all classes added, add drink tables buggy