Started working on control handeling