More outlining of desired classes. Nothing in a working state yet.