Refactored a little. Going to try to add grunt to this project... Wish me luck