Working on crafting and simplifying stuff