proof of concept done, start of re-architecting