Initial hack

Hack, lot's of issues but works.