File renames, added units (untested) and changed the way attributes work