Work in progress...

Check out the current progress at @isthisalberto on