Started work on design & more bugfixes