WIP- pushing out what i have for review.