Initial check in of hacks