Initial push

1.7 compatable.