Started refactor of twacs