initial commit
removed some hard coding