cleaned up the structure a bit. need to figure out how to change from default to custom name