Refactored and more code cleanup
Added Test board