Added the aragon stack and cleaned up the code a little bit. Next step: refactor