Fixing a lot of AOP stuff and building up the forms