Initial testable version