initial changes

@ziafazal , this is your refactor branch -- just checking to see if a local rebase addresses Github's concern(s)