More stubs etc

More stubs and classes fleshed out