almost finished (updated classes). Currently building