framework is working. some minor changes remaining.