Feature/carlbrain refactor