Need to change various integer return values with enum Returnvals.
Changes:
 -Added attributes to Tank