First draft

Original commit - a lot left to do