Initial commit, quick and dirty fork but useful..