Simplified vector class a ton. Backup commit