Cleaned up comments partial, Add static model