Implemented some glue
Fixed a netbeans/git fuckup