Version 1.0 before code cleanup