issues 28 still debating if this is an issue that needs changing DO NOT MERGE to master