First working prototype

Changed regex. Working for computed, but needs massive refactoring to
make the first base-release. More this weekend :)