Feature/basic framework