Firs commit - some progress done