Add basic Assert class and re-factoring