Initial commit

Partially working