Completed most of inital stuff