Second inital commit with base code, ect