quick commit. Finish this mess later