Removed IDs and moved into class for multi page use