[DO NOT MERGE - WIP] Working on the design!