Basic stuff added

subject to huge changes!