Work in progress

Started working