Inital working version
formatting changes