Another tiny commit. Added some files and resolved circural dependency issues.