Added spec ideas, began migrating code and organizing what needs to be done. WIP