Couple of changes to struct on Impl. Need to finish tomorrow