Continuing Refactor

Still refining action and state system, will still culling old
commented code to properly clean up the solution.