First commit with quick hack code.