some reorganizing, removed deposit methods until I rewrite for 07