Beta version of initial implementation