Many changes, finally have an update to the code base