changed to v1 of framework. more or less does what it should by now but needs polishing