Better scaffolding; Add future UI support; Better logging