Refactoring and begin reconstructing webslinger