Basic dev functionality added, refactored code.