quick commit. Organize this mess later