WIP: Adding some design ideas